From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752388AbcAUBnQ (ORCPT ); Wed, 20 Jan 2016 20:43:16 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:60295 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751228AbcAUBnL (ORCPT ); Wed, 20 Jan 2016 20:43:11 -0500 X-AuditID: cbfee68d-f79646d000001355-a3-56a037adc8a7 Message-id: <56A037A4.4040402@samsung.com> Date: Thu, 21 Jan 2016 10:43:00 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-version: 1.0 To: Shawn Lin Cc: Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mmc: dw_mmc: remove DW_MCI_QUIRK_BROKEN_CARD_DETECTION quirk References: <1453107026-19814-1-git-send-email-shawn.lin@rock-chips.com> In-reply-to: <1453107026-19814-1-git-send-email-shawn.lin@rock-chips.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeLIzCtJLcpLzFFi42JZI2JSoLvWfEGYQfdNEYvLu+awWRz5389o cefJelaL42vDHVg87lzbw+bxd9Z+Fo/Pm+QCmKO4bFJSczLLUov07RK4Mpo+bGQuuC9TcWbi FvYGxq9iXYycHBICJhK7981jg7DFJC7cWw9kc3EICaxglLjT3s4OU7Tl8gl2iMRSRokLu9+z QDgPGCW2nF3ECFLFK6AlseppLwuIzSKgKrFx5l+wsWwCOhLbvx1nArFFBcIkHqzbywpRLyjx Y/I9sHoRAQ2JG2evg9UzCyRLdPw7ChYXFgiWaN+xA6xeSMBDouvPfTCbU8BT4s+nY0AXcQDV 60ncv6gF0SovsXnNW2aQ2yQE1rFLTL91nhHiHgGJb5MPsYDUSwjISmw6wAzxmKTEwRU3WCYw is1CctEshKmzkExdwMi8ilE0tSC5oDgpvchQrzgxt7g0L10vOT93EyMwgk7/e9a7g/H2AetD jAIcjEo8vDeuzQ8TYk0sK67MPcRoCnTERGYp0eR8YJzmlcQbGpsZWZiamBobmVuaKYnzKkr9 DBYSSE8sSc1OTS1ILYovKs1JLT7EyMTBKdXAOHn6kzcCPAf/3Vx8J8fYm39yqUDe3pvOcTFB 8877WnqsDIlmmxfH19YZonKu6z/fQfYV7zI5JaYm5n1bcmDLJO0n2x9O/thjw9G/6WHr1eZ5 M+8u/VGyJnjPDPZfHhtzHIwCc+2zI39M5PcKDCo1+KObvptddZLYieMXCq/f3SmizXoiw3Ty dCWW4oxEQy3mouJEAFYo0pqbAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKIsWRmVeSWpSXmKPExsVy+t9jAd215gvCDA6c5re4vGsOm8WR//2M FneerGe1OL423IHF4861PWwef2ftZ/H4vEkugDmqgdEmIzUxJbVIITUvOT8lMy/dVsk7ON45 3tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB2ibkkJZYk4pUCggsbhYSd8O04TQEDddC5jGCF3f kCC4HiMDNJCwhjGj6cNG5oL7MhVnJm5hb2D8KtbFyMkhIWAiseXyCXYIW0ziwr31bF2MXBxC AksZJS7sfs8C4TxglNhydhEjSBWvgJbEqqe9LCA2i4CqxMaZf9lAbDYBHYnt344zgdiiAmES D9btZYWoF5T4MfkeWL2IgIbEjbPXweqZBZIlOv4dBYsLCwRLtO/YAVYvJOAh0fXnPpjNKeAp 8efTMaDrOIDq9STuX9SCaJWX2LzmLfMERoFZSDbMQqiahaRqASPzKkaJ1ILkguKk9FyjvNRy veLE3OLSvHS95PzcTYzgKH0mvYPx8C73Q4wCHIxKPLwGN+eHCbEmlhVX5h5ilOBgVhLhlVNZ ECbEm5JYWZValB9fVJqTWnyI0RQYBBOZpUST84EJJK8k3tDYxMzI0sjc0MLI2FxJnHffpcgw IYH0xJLU7NTUgtQimD4mDk6pBsbdxY8y3ifymv3riWOTVxZxup9xmF/r8t0zhr5Wwe9W6xtd XCL1L0XFjMfLaVcH0ysfR4O5IhuYDE39N8lvV1ZbMWnd7B3Not9fP3vIsvbo/IuqlmZnvSJK V5fvnf2hvOeN/dFZn+eV/Z/XsXJbvUdrxowHV/xmiK710NSdkHGxetfemsBj004rsRRnJBpq MRcVJwIACId+uegCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Shawn. After applied this patch at my dw-mmc git, i found some problem. So I will revert this until fixing problem. On 01/18/2016 05:50 PM, Shawn Lin wrote: > dw_mmc already use mmc_of_parse to get "broken-cd" property, > but it considered "broken-cd" to be a quirk in its driver. We > don't need this quirk here, and just take what we need from > mmc->caps. > > Signed-off-by: Shawn Lin > --- > > drivers/mmc/host/dw_mmc.c | 23 +++-------------------- > include/linux/mmc/dw_mmc.h | 4 +--- > 2 files changed, 4 insertions(+), 23 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 7128351..bbf9ca6 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -1450,12 +1450,11 @@ static int dw_mci_get_cd(struct mmc_host *mmc) > { > int present; > struct dw_mci_slot *slot = mmc_priv(mmc); > - struct dw_mci_board *brd = slot->host->pdata; > struct dw_mci *host = slot->host; > int gpio_cd = mmc_gpio_get_cd(mmc); > > /* Use platform get_cd function, else try onboard card detect */ > - if ((brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) || > + if ((mmc->caps & MMC_CAP_NEEDS_POLL) || > (mmc->caps & MMC_CAP_NONREMOVABLE)) > present = 1; > else if (!IS_ERR_VALUE(gpio_cd)) > @@ -2840,23 +2839,13 @@ static void dw_mci_dto_timer(unsigned long arg) > } > > #ifdef CONFIG_OF > -static struct dw_mci_of_quirks { > - char *quirk; > - int id; > -} of_quirks[] = { > - { > - .quirk = "broken-cd", > - .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, > - }, > -}; > - > static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > { > struct dw_mci_board *pdata; > struct device *dev = host->dev; > struct device_node *np = dev->of_node; > const struct dw_mci_drv_data *drv_data = host->drv_data; > - int idx, ret; > + int ret; > u32 clock_frequency; > > pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); > @@ -2871,11 +2860,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > pdata->num_slots = 1; > } > > - /* get quirks */ > - for (idx = 0; idx < ARRAY_SIZE(of_quirks); idx++) > - if (of_get_property(np, of_quirks[idx].quirk, NULL)) > - pdata->quirks |= of_quirks[idx].id; > - > if (of_property_read_u32(np, "fifo-depth", &pdata->fifo_depth)) > dev_info(dev, > "fifo-depth property not found, using value of FIFOTH register as default\n"); > @@ -2908,13 +2892,12 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > > static void dw_mci_enable_cd(struct dw_mci *host) > { > - struct dw_mci_board *brd = host->pdata; > unsigned long irqflags; > u32 temp; > int i; > > /* No need for CD if broken card detection */ > - if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) > + if (host->cur_slot->mmc->caps & MMC_CAP_NEEDS_POLL) dw_mci_enable_cd is called in dw_mci_probe. So host->cur_slot is not assigned to anything.. Best Regards, Jaehoon Chung > return; > > /* No need for CD if all slots have a non-error GPIO */ > diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h > index 89df7ab..250d822 100644 > --- a/include/linux/mmc/dw_mmc.h > +++ b/include/linux/mmc/dw_mmc.h > @@ -235,10 +235,8 @@ struct dw_mci_dma_ops { > }; > > /* IP Quirks/flags. */ > -/* Unreliable card detection */ > -#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(0) > /* Timer for broken data transfer over scheme */ > -#define DW_MCI_QUIRK_BROKEN_DTO BIT(1) > +#define DW_MCI_QUIRK_BROKEN_DTO BIT(0) > > struct dma_pdata; > >